t / t4135 / diff-with quote.diffon commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1--- "postimage".txt.orig        2010-08-18 20:13:31.744002255 -0500
   2+++ "postimage".txt     2010-08-18 20:13:31.744002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage